Final polishing, removed all warnings