Fixes and function moves.