Fixed somethigns