Some config and js fixes: