Various Slick fixes