More fixes, argh!!!