Fixes for swagger