Fix missing 'return true' statements