Fixes for cloning sites