Cleaned up a couple more kludgy things