Import and Syntax Errors Fixes