Minor cleanup, fixes