Fixes and additional functionality for positioning.