Updated portable targets

This change is intended to fix #33, although I am only able to perform limited testing on the result.