Fix some smaller issues