small modifications
Small fixes for future GHC 7.10 compatibility