Fixes againts errors