Resolves few compilation errors