Dev

@frett these were oversights on my part... good catch on both.  Want me to merge them in?