- fixed some compiler problems