Fixes

It shoud fix my bad mistakes.