Fixes & cleanup.