Misc fix for a mistake

Time to implement something new, just wanted to get these changes out
before I start work on it.