Fixing some simple things