Fix a few
Fix for extensions for client