Fixing some bugs

@bellycard/apps