Fixing some compiler errors