Small fixes from the last merge update.