Fix: cleaned up warnings