Some cosmetic changes to compilation procedure