Misc. tuneup