Bug fixes for basic stuf

First run of the new system, things got fixed ;)