More fixes to basic funcionality