Various bug updates