Varous fixes including js strict