Fix and cleanup somethings