Minor Changes

Minor annotation changes to remove some warnings... and keep up my
GitHub spree.