Fixed some props