Fixes in fictures for refactor