More fixes yet still unfunctional