Some fixes to babies controller