Adding the latest bug fixes