Fixed anchoring issues