Fix #693, also tracked down a few more spots so hopefully the perspective won't seem to switch so randomly.