AdminBundle - Some fixes