Fixed a couple of embarrassing mistakes