Fixing support library setup