Some fast fixes

In this commit I fixed some important bugs what I forgot to fix