4.3 compatibility
fixed warnings