Fixed a couple of errors that where created on last merge