fixes to make it work like vanilla