Some minor fixes. Still unusable