Updated bug fixes