More bug fixes - yay