diff --git a/app/assets/stylesheets/breakpoints.css.scss b/app/assets/stylesheets/breakpoints.scss
similarity index 100%
rename from app/assets/stylesheets/breakpoints.css.scss
rename to app/assets/stylesheets/breakpoints.scss
diff --git a/app/assets/stylesheets/mastodon.css.scss b/app/assets/stylesheets/mastodon.scss
similarity index 100%
rename from app/assets/stylesheets/mastodon.css.scss
rename to app/assets/stylesheets/mastodon.scss
diff --git a/app/assets/stylesheets/osem-dashboard.css.scss b/app/assets/stylesheets/osem-dashboard.scss
similarity index 96%
rename from app/assets/stylesheets/osem-dashboard.css.scss
rename to app/assets/stylesheets/osem-dashboard.scss
index 5dc69879..b2d0d125 100644
--- a/app/assets/stylesheets/osem-dashboard.css.scss
+++ b/app/assets/stylesheets/osem-dashboard.scss
@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 
 .dashbox span.fa {
   line-height: 1.1em;
diff --git a/app/assets/stylesheets/osem-fonts.css.scss b/app/assets/stylesheets/osem-fonts.scss
similarity index 100%
rename from app/assets/stylesheets/osem-fonts.css.scss
rename to app/assets/stylesheets/osem-fonts.scss
diff --git a/app/assets/stylesheets/osem-navbar.css.scss b/app/assets/stylesheets/osem-navbar.scss
similarity index 96%
rename from app/assets/stylesheets/osem-navbar.css.scss
rename to app/assets/stylesheets/osem-navbar.scss
index bfaac9ac..011ebc89 100644
--- a/app/assets/stylesheets/osem-navbar.css.scss
+++ b/app/assets/stylesheets/osem-navbar.scss
@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 .nav-osem {
     border: none;
     @include breakpoint(xs) {
diff --git a/app/assets/stylesheets/osem-payments.css.scss b/app/assets/stylesheets/osem-payments.scss
similarity index 100%
rename from app/assets/stylesheets/osem-payments.css.scss
rename to app/assets/stylesheets/osem-payments.scss
diff --git a/app/assets/stylesheets/osem-rating.css.scss b/app/assets/stylesheets/osem-rating.scss
similarity index 100%
rename from app/assets/stylesheets/osem-rating.css.scss
rename to app/assets/stylesheets/osem-rating.scss
diff --git a/app/assets/stylesheets/osem-schedule.css.scss b/app/assets/stylesheets/osem-schedule.scss
similarity index 100%
rename from app/assets/stylesheets/osem-schedule.css.scss
rename to app/assets/stylesheets/osem-schedule.scss
diff --git a/app/assets/stylesheets/osem-splash.css.scss b/app/assets/stylesheets/osem-splash.scss
similarity index 99%
rename from app/assets/stylesheets/osem-splash.css.scss
rename to app/assets/stylesheets/osem-splash.scss
index 387dfc00..32cbb822 100644
--- a/app/assets/stylesheets/osem-splash.css.scss
+++ b/app/assets/stylesheets/osem-splash.scss
@@ -1,4 +1,4 @@
-@import "breakpoints.css.scss";
+@import "breakpoints.scss";
 
 #splash {
   // Counter the general padding for #content
diff --git a/app/assets/stylesheets/osem.css.scss b/app/assets/stylesheets/osem.scss
similarity index 100%
rename from app/assets/stylesheets/osem.css.scss
rename to app/assets/stylesheets/osem.scss
diff --git a/app/assets/stylesheets/strap-on.css.scss b/app/assets/stylesheets/strap-on.scss
similarity index 100%
rename from app/assets/stylesheets/strap-on.css.scss
rename to app/assets/stylesheets/strap-on.scss
diff --git a/app/views/admin/venues/show.html.haml b/app/views/admin/venues/show.html.haml
index b50c10da..36906e05 100644
--- a/app/views/admin/venues/show.html.haml
+++ b/app/views/admin/venues/show.html.haml
@@ -8,7 +8,7 @@
   .row
     .col-md-6
       - if @conference.venue.location?
-        = render '/conferences/venue_map'
+        = render '/conferences/venue_map', venue: @conference.venue
       -else
         - if @venue.commercial.nil?
           .row
diff --git a/app/views/booths/show.html.haml b/app/views/booths/show.html.haml
index 6b12229d..f1790504 100644
--- a/app/views/booths/show.html.haml
+++ b/app/views/booths/show.html.haml
@@ -6,7 +6,7 @@
           = image_tag(@booth.picture.thumb.url, size: '20%', alt: '')
         = @booth.title
         .btn-group.pull-right
-          = link_to 'Edit', edit_admin_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
+          = link_to 'Edit', edit_conference_booth_path(@conference.short_title, @booth), class: 'btn btn-mini btn-primary'
 
   .row
     .col-md-12
diff --git a/docker-compose.env.example b/docker-compose.env.example
index 905ff612..7bda181b 100644
--- a/docker-compose.env.example
+++ b/docker-compose.env.example
@@ -34,7 +34,7 @@ SECRET_KEY_BASE=changemechangemechangeme"
 OSEM_EMAIL_ADDRESS="osem@mailhog"
 OSEM_SMTP_AUTHENTICATION="login"
 OSEM_SMTP_ADDRESS="mailhog"
-OSEM_SMTP_PORT="1025"
+OSEM_SMTP_PORT=1025
 OSEM_SMTP_USERNAME="mailhog"
 OSEM_SMTP_PASSWORD="mailhog"