Some rabbit controller improvements