Fixing up some facing bugs