Fix up Alegend45's changes