Fix Aly's bugs