small semantic fixes