Temp fixes for errors encoun