Implement fixes