Certain fixes