Fixing some tiny details