More bad coding fix attempts...