Fixing stuff that I apparently hadn't completed last time around.