Cale minor bugfixes