Fixes and moved Chosen directive