more semantic fixes