First bunch of updates to make things compileable..