Fixed somethings