Just some minor work