last compile fixes