Updating build with bug fixes