Fix a couple small buggers