misc changes to make things compile