Minor quick cleanups