Fixed some issues with PLSS