Added compile fixes