quickndirty fixes