Add b-man's fixes.