Fix Slick 2.0 issues