Fixed somethings up