Address remaining dock issues(?)