Fixing some issues with doubles and just cosmetics