Some fixes for profile modal