Fixing up webapp things