minimal fixes for callisto