Fixes for Stranik