Omnilink cleanup

Cleaning up a few minor things