Minor cleanup/fixes