CFY-54 Fixes for falke8