Quickfixes and cleanup