fixes for foundation