Fixed stupid stuff