First pass for Solaris support in initial promises