Fixes for kvapps Issue #426
Fix for Issue #514