cleanup related compile fixes