Partial fixes done