Fixed a few issues with bunny connector