Fixed some smaller issues