Even more fixes, implementations...