Attempting Javascript fixes