Some fixes

Everything magically starts to work <3