Fix globals