Code cleanup, and note a Known Issue