fixes for app-validator