Repositioning some methods to the correct layer.