Cleaned up a few more dust spots