Some fixes on slim => haml