Fixes for it. 5