(cleanup) minor fixes