Fixed some issues to better accomodate turbolinks