memeka's fixes