Small semantic fixes