Cleanups to remove warnings after last round of fixes