Several misc changes