Some Initial fixes