diff --git a/src/components/fileupload/FileUpload.vue b/src/components/fileupload/FileUpload.vue
index def0feb5b..169ad9d7e 100644
--- a/src/components/fileupload/FileUpload.vue
+++ b/src/components/fileupload/FileUpload.vue
@@ -361,12 +361,12 @@ export default {
     border: 0 none;
 }
 
-.p-fileupload-choose {
+.p-button.p-fileupload-choose {
     position: relative;
     overflow: hidden;
 }
 
-.p-fileupload-choose input[type=file] {
+.p-button.p-fileupload-choose input[type=file] {
     position: absolute;
     top: 0;
     right: 0;
diff --git a/src/components/multiselect/MultiSelect.vue b/src/components/multiselect/MultiSelect.vue
index 0db788476..ed8dee373 100644
--- a/src/components/multiselect/MultiSelect.vue
+++ b/src/components/multiselect/MultiSelect.vue
@@ -354,7 +354,6 @@ export default {
 </script>
 
 <style>
-/** MultiSelect **/
 .p-multiselect {
     display: inline-block;
     position: relative;
diff --git a/src/views/message/MessageDemo.vue b/src/views/message/MessageDemo.vue
index 8c2567428..d013b4caf 100644
--- a/src/views/message/MessageDemo.vue
+++ b/src/views/message/MessageDemo.vue
@@ -69,7 +69,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style scoped>
 button.p-button {
     margin-right: .5em;
 }