Fixed broken stuff from rebase