Different bug fixes