Fix some variables