Minor fixes
Pointless Fix Reverted