Started bug fixes