Realigned and fixed warnings