Fixing some small issues here and there