Fix bugs from the last commits, sorry :(