Fixed issues to get bada compiling

Fixed issues to get bada compiling