Updating for some bug fixes