Fixing some simple bugs - all accepted!