Fixes

Now it can be merged.