More work on fspoll