Cleanup: Issues #198, #199