Various bug/compile fixes