Commiting minor bug fixes