Style tweaks to remove warnings