Further semantic fixes