Fix for vals&vars
Fix for implicit types in vals