forgot to check in some fixes