Fixes related work