Fixes for thawab