Fix Semantic Issues