Fix valiable declarations