Move small fixes