Corrected compilation bugs