Fix some compiler problems...