certain fixes