commits for compile fixes