Minor cleanup, noted further issues for later fix