Plugged in fixes from Derick Bailey