More bug fixes!