Cartalyst bugfixes