Some misc changes that Github complains