Changes for correct build