Fixed lots of small pre-release bugs