Fixes, first deployed test version