More type hackery