Adding more bug fixes