Fixing some of last commit problems

Not sure what TortoiseSVN did but nothing logic-wise changed.