More bug fixes with boss 2