Fixes and implementations