Added in two fixes form Darkwolf's Branch.