Various Changes to Fix Weird Issues