Mom 87 various bugs