Fixes for kaleen