Fixes for kvapps. #426