Testing and fixes
Minor fixes