Make compilation less prone to failure, fix dev mode