More bug fixes... sigh