Some bug fixes to get this thing to work