Some fixes for custom props