Minor fixes in environments with custom compiler and its subtleties