Consistency cleanup and add api-paste config