Misc bugs/errors.