compilation fixes

jtwitter compiles on my system again; also fixing the latest merge
errors