Fixes to make things work