Fixes, added vanilla for one element