bug fixes for buddies