Fixed compile & watch