Fixing some basic things