Fixes for Twinks