compile fixes, more of them1