Minor fixes: warning removal